From b3a20a96eb2b91a5b0b8a8fb506e20a2fb50ebe8 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 00:10:11 -0500
Subject: libthread: add threadmaybackground

Programs that want to background themselves now need
to define threadmaybackground returning 1.
This avoids a confusing (to people and debuggers)
extra parent process for all the threaded programs
that will never want to background themselves.
---
 src/libthread/mkfile | 1 +
 1 file changed, 1 insertion(+)

(limited to '*[pngfile]')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index 8a77a316..eca4f4df 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -4,6 +4,7 @@ SYSOFILES=`{sh ./sysofiles.sh}
 LIB=libthread.a
 OFILES=\
 	$SYSOFILES\
+	bg.$O\
 	channel.$O\
 	daemonize.$O\
 	exec.$O\
-- 
cgit v1.2.3


From 18571208068d5fe2f0bf7b4e980525a7f577c503 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 07:18:30 -0500
Subject: libthread: simplify

Now that everything uses pthreads and pthreadperthread,
can delete various conditionals, all the custom context code,
and so on. Also update documents.

Fixes #355.
---
 src/libthread/mkfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '*[pngfile]')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index eca4f4df..40941f43 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -1,15 +1,14 @@
 <$PLAN9/src/mkhdr
 
-SYSOFILES=`{sh ./sysofiles.sh}
 LIB=libthread.a
 OFILES=\
-	$SYSOFILES\
 	bg.$O\
 	channel.$O\
 	daemonize.$O\
 	exec.$O\
 	ioproc.$O\
 	iorw.$O\
+	pthread.$O\
 	ref.$O\
 	thread.$O\
 	wait.$O\
-- 
cgit v1.2.3


From 99dee78c2d44641ba56e5bb640d732f993b3dfa1 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 07:39:16 -0500
Subject: all: remove $OBJTYPE from build

Now that we assume pthreads, the only assembly
left is in libmp and libsec.
We only ever added assembly for 386.
The portable C code is fine for plan9port.
---
 bin/9l                           |  12 +-
 src/libmp/386/mkfile             |  15 ---
 src/libmp/PowerMacintosh/mkfile  |   4 -
 src/libmp/arm/mkfile             |   4 -
 src/libmp/arm64/mkfile           |   4 -
 src/libmp/mips/mkfile            |   4 -
 src/libmp/mkfile                 |   2 +-
 src/libmp/port/mkfile            |   5 +-
 src/libmp/power/mkfile           |   4 -
 src/libmp/sparc64/mkfile         |   4 -
 src/libmp/sun4u/mkfile           |   4 -
 src/libmp/x86_64/mkfile          |   4 -
 src/libsec/386/md5block.spp      | 248 ---------------------------------------
 src/libsec/386/mkfile            |  26 ----
 src/libsec/386/sha1block.spp     | 221 ----------------------------------
 src/libsec/PowerMacintosh/mkfile |   4 -
 src/libsec/arm/mkfile            |   4 -
 src/libsec/arm64/mkfile          |   4 -
 src/libsec/mips/mkfile           |   4 -
 src/libsec/mkfile                |   2 +-
 src/libsec/port/mkfile           |   3 +-
 src/libsec/power/mkfile          |   4 -
 src/libsec/sparc64/mkfile        |   4 -
 src/libsec/sun4u/mkfile          |   4 -
 src/libsec/x86_64/mkfile         |   4 -
 src/mkfile                       |   2 -
 unix/make/Make.Darwin            |   7 ++
 27 files changed, 17 insertions(+), 590 deletions(-)
 delete mode 100644 src/libmp/386/mkfile
 delete mode 100644 src/libmp/PowerMacintosh/mkfile
 delete mode 100644 src/libmp/arm/mkfile
 delete mode 100644 src/libmp/arm64/mkfile
 delete mode 100644 src/libmp/mips/mkfile
 delete mode 100644 src/libmp/power/mkfile
 delete mode 100644 src/libmp/sparc64/mkfile
 delete mode 100644 src/libmp/sun4u/mkfile
 delete mode 100644 src/libmp/x86_64/mkfile
 delete mode 100644 src/libsec/386/md5block.spp
 delete mode 100644 src/libsec/386/mkfile
 delete mode 100644 src/libsec/386/sha1block.spp
 delete mode 100644 src/libsec/PowerMacintosh/mkfile
 delete mode 100644 src/libsec/arm/mkfile
 delete mode 100644 src/libsec/arm64/mkfile
 delete mode 100644 src/libsec/mips/mkfile
 delete mode 100644 src/libsec/power/mkfile
 delete mode 100644 src/libsec/sparc64/mkfile
 delete mode 100644 src/libsec/sun4u/mkfile
 delete mode 100644 src/libsec/x86_64/mkfile
 create mode 100644 unix/make/Make.Darwin

(limited to '*[pngfile]')

diff --git a/bin/9l b/bin/9l
index f6eb0ba1..abca55fc 100755
--- a/bin/9l
+++ b/bin/9l
@@ -9,7 +9,7 @@ verbose=false
 
 nmflags=""
 extralibs="-lm"
-tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
+tag="${SYSNAME:-`uname`}"
 case "$tag" in
 *DragonFly*|*BSD*)
 	ld="${CC9:-gcc} $CC9FLAGS"
@@ -27,14 +27,8 @@ case "$tag" in
 	userpath=true
 	extralibs="$extralibs -lutil -lresolv -lpthread"
 	;;
-*Darwin*x86_64*)
-	ld="${CC9:-gcc} -m64 $CC9FLAGS"
-	;;
-*Darwin-arm64*)
-	ld="${CC9:-gcc} -m64 $CC9FLAGS"
-	;;
 *Darwin*)
-	ld="${CC9:-gcc} -m32 $CC9FLAGS"
+	ld="${CC9:-gcc} -m64 $CC9FLAGS"
 	;;
 *SunOS*)
 	ld="${CC9:-cc} -g $CC9FLAGS"
@@ -255,7 +249,7 @@ then
 		fi
 		# Don't say -L with a non-existent directory: Xcode complains.
 		# x86_64 seems to put its 64-bit libraries in lib64.
-		if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
+		if [ "`uname -m`" = "x86_64" -a -d "$X11/lib64" ]
 		then
 			libsl="$libsl -L$X11/lib64"
 		fi
diff --git a/src/libmp/386/mkfile b/src/libmp/386/mkfile
deleted file mode 100644
index c63daf42..00000000
--- a/src/libmp/386/mkfile
+++ /dev/null
@@ -1,15 +0,0 @@
-<$PLAN9/src/mkhdr
-
-LIB=libmp.a
-UNAME=`uname`
-A=`[ $UNAME = Darwin ] && echo -Darwin`
-OFILES=\
-	mpdigdiv$A.$O\
-	mpvecadd$A.$O\
-	mpvecdigmuladd$A.$O\
-	mpvecdigmulsub$A.$O\
-	mpvecsub$A.$O\
-
-HFILES=$PLAN9/include/mp.h ../port/dat.h
-
-<$PLAN9/src/mksyslib
diff --git a/src/libmp/PowerMacintosh/mkfile b/src/libmp/PowerMacintosh/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/PowerMacintosh/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/arm/mkfile b/src/libmp/arm/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/arm/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/arm64/mkfile b/src/libmp/arm64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/arm64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/mips/mkfile b/src/libmp/mips/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/mips/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/mkfile b/src/libmp/mkfile
index e3f1aa69..81f237c4 100644
--- a/src/libmp/mkfile
+++ b/src/libmp/mkfile
@@ -2,6 +2,6 @@
 
 DIRS=\
 	port\
-	$OBJTYPE\
+#	$OBJTYPE\
 
 <$PLAN9/src/mkdirs
diff --git a/src/libmp/port/mkfile b/src/libmp/port/mkfile
index b0cf77cd..15612aa7 100644
--- a/src/libmp/port/mkfile
+++ b/src/libmp/port/mkfile
@@ -34,8 +34,9 @@ FILES=\
 	mptouv\
 
 ALLOFILES=${FILES:%=%.$O}
-# cull things in the per-machine directories from this list
-OFILES=	`{sh ./reduce $O $OBJTYPE $ALLOFILES}
+# # cull things in the per-machine directories from this list
+# OFILES=	`{sh ./reduce $O $ALLOFILES}
+OFILES=$ALLOFILES
 
 HFILES=\
 	$PLAN9/include/lib9.h\
diff --git a/src/libmp/power/mkfile b/src/libmp/power/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/power/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/sparc64/mkfile b/src/libmp/sparc64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/sparc64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/sun4u/mkfile b/src/libmp/sun4u/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/sun4u/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libmp/x86_64/mkfile b/src/libmp/x86_64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libmp/x86_64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/386/md5block.spp b/src/libsec/386/md5block.spp
deleted file mode 100644
index feebf615..00000000
--- a/src/libsec/386/md5block.spp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *  rfc1321 requires that I include this.  The code is new.  The constants
- *  all come from the rfc (hence the copyright).  We trade a table for the
- *  macros in rfc.  The total size is a lot less. -- presotto
- *
- *	Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- *	rights reserved.
- *
- *	License to copy and use this software is granted provided that it
- *	is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- *	Algorithm" in all material mentioning or referencing this software
- *	or this function.
- *
- *	License is also granted to make and use derivative works provided
- *	that such works are identified as "derived from the RSA Data
- *	Security, Inc. MD5 Message-Digest Algorithm" in all material
- *	mentioning or referencing the derived work.
- *
- *	RSA Data Security, Inc. makes no representations concerning either
- *	the merchantability of this software or the suitability of this
- *	software forany particular purpose. It is provided "as is"
- *	without express or implied warranty of any kind.
- *	These notices must be retained in any copies of any part of this
- *	documentation and/or software.
- */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-#define PAYME(x) $##x
-
-/*
- * SI is data
- *	a += FN(B,C,D);
- *	a += x[sh] + t[sh];
- *	a = (a << S11) | (a >> (32 - S11));
- *	a += b;
- */
-
-#define BODY1(off,V,FN,SH,A,B,C,D)\
-	FN(B,C,D)\
-	leal V(A, %edi, 1), A;\
-	addl off(%ebp), A;\
-	roll PAYME(SH), A;\
-	addl B, A;\
-
-#define BODY(off,V,FN,SH,A,B,C,D)\
-	FN(B,C,D)\
-	leal V(A, %edi, 1), A;\
-	addl (off)(%ebp), A;\
-	roll PAYME(SH), A;\
-	addl B,A;\
-
-/*
- * fn1 = ((c ^ d) & b) ^ d
- */
-#define FN1(B,C,D)\
-	movl C, %edi;\
-	xorl D, %edi;\
-	andl B, %edi;\
-	xorl D, %edi;\
-
-/*
- * fn2 = ((b ^ c) & d) ^ c;
- */
-#define FN2(B,C,D)\
-	movl B, %edi;\
-	xorl C, %edi;\
-	andl D, %edi;\
-	xorl C, %edi;\
-
-/*
- * fn3 = b ^ c ^ d;
- */
-#define FN3(B,C,D)\
-	movl B, %edi;\
-	xorl C, %edi;\
-	xorl D, %edi;\
-
-/*
- * fn4 = c ^ (b | ~d);
- */
-#define FN4(B,C,D)\
-	movl D, %edi;\
-	xorl $-1, %edi;\
-	orl B, %edi;\
-	xorl C, %edi;\
-
-#define	STACKSIZE	20
-
-#define	DATA	(STACKSIZE+8)
-#define	LEN	(STACKSIZE+12)
-#define	STATE	(STACKSIZE+16)
-
-#define EDATA	(STACKSIZE-4)
-#define OLDEBX	(STACKSIZE-8)
-#define OLDESI	(STACKSIZE-12)
-#define OLDEDI	(STACKSIZE-16)
-
-	.text
-
-	.p2align 2,0x90
-#ifdef __Darwin__
-	.globl __md5block
-	__md5block:
-#else
-	.globl _md5block
-	_md5block:
-#endif
-
-	/* Prelude */
-	pushl %ebp
-	subl $(STACKSIZE), %esp
-	movl %ebx, OLDEBX(%esp)
-	movl %esi, OLDESI(%esp)
-	movl %edi, OLDEDI(%esp)
-
-	movl	DATA(%esp), %eax
-	addl	LEN(%esp), %eax
-	movl	%eax, EDATA(%esp)
-
-	movl DATA(%esp), %ebp
-
-0:
-	movl STATE(%esp), %esi
-	movl (%esi), %eax
-	movl 4(%esi), %ebx
-	movl 8(%esi), %ecx
-	movl 12(%esi), %edx
-
-	BODY1( 0*4,0xd76aa478,FN1,S11,%eax,%ebx,%ecx,%edx)
-	BODY1( 1*4,0xe8c7b756,FN1,S12,%edx,%eax,%ebx,%ecx)
-	BODY1( 2*4,0x242070db,FN1,S13,%ecx,%edx,%eax,%ebx)
-	BODY1( 3*4,0xc1bdceee,FN1,S14,%ebx,%ecx,%edx,%eax)
-
-	BODY1( 4*4,0xf57c0faf,FN1,S11,%eax,%ebx,%ecx,%edx)
-	BODY1( 5*4,0x4787c62a,FN1,S12,%edx,%eax,%ebx,%ecx)
-	BODY1( 6*4,0xa8304613,FN1,S13,%ecx,%edx,%eax,%ebx)
-	BODY1( 7*4,0xfd469501,FN1,S14,%ebx,%ecx,%edx,%eax)
-
-	BODY1( 8*4,0x698098d8,FN1,S11,%eax,%ebx,%ecx,%edx)
-	BODY1( 9*4,0x8b44f7af,FN1,S12,%edx,%eax,%ebx,%ecx)
-	BODY1(10*4,0xffff5bb1,FN1,S13,%ecx,%edx,%eax,%ebx)
-	BODY1(11*4,0x895cd7be,FN1,S14,%ebx,%ecx,%edx,%eax)
-
-	BODY1(12*4,0x6b901122,FN1,S11,%eax,%ebx,%ecx,%edx)
-	BODY1(13*4,0xfd987193,FN1,S12,%edx,%eax,%ebx,%ecx)
-	BODY1(14*4,0xa679438e,FN1,S13,%ecx,%edx,%eax,%ebx)
-	BODY1(15*4,0x49b40821,FN1,S14,%ebx,%ecx,%edx,%eax)
-
-
-	BODY( 1*4,0xf61e2562,FN2,S21,%eax,%ebx,%ecx,%edx)
-	BODY( 6*4,0xc040b340,FN2,S22,%edx,%eax,%ebx,%ecx)
-	BODY(11*4,0x265e5a51,FN2,S23,%ecx,%edx,%eax,%ebx)
-	BODY( 0*4,0xe9b6c7aa,FN2,S24,%ebx,%ecx,%edx,%eax)
-
-	BODY( 5*4,0xd62f105d,FN2,S21,%eax,%ebx,%ecx,%edx)
-	BODY(10*4,0x02441453,FN2,S22,%edx,%eax,%ebx,%ecx)
-	BODY(15*4,0xd8a1e681,FN2,S23,%ecx,%edx,%eax,%ebx)
-	BODY( 4*4,0xe7d3fbc8,FN2,S24,%ebx,%ecx,%edx,%eax)
-
-	BODY( 9*4,0x21e1cde6,FN2,S21,%eax,%ebx,%ecx,%edx)
-	BODY(14*4,0xc33707d6,FN2,S22,%edx,%eax,%ebx,%ecx)
-	BODY( 3*4,0xf4d50d87,FN2,S23,%ecx,%edx,%eax,%ebx)
-	BODY( 8*4,0x455a14ed,FN2,S24,%ebx,%ecx,%edx,%eax)
-
-	BODY(13*4,0xa9e3e905,FN2,S21,%eax,%ebx,%ecx,%edx)
-	BODY( 2*4,0xfcefa3f8,FN2,S22,%edx,%eax,%ebx,%ecx)
-	BODY( 7*4,0x676f02d9,FN2,S23,%ecx,%edx,%eax,%ebx)
-	BODY(12*4,0x8d2a4c8a,FN2,S24,%ebx,%ecx,%edx,%eax)
-
-
-	BODY( 5*4,0xfffa3942,FN3,S31,%eax,%ebx,%ecx,%edx)
-	BODY( 8*4,0x8771f681,FN3,S32,%edx,%eax,%ebx,%ecx)
-	BODY(11*4,0x6d9d6122,FN3,S33,%ecx,%edx,%eax,%ebx)
-	BODY(14*4,0xfde5380c,FN3,S34,%ebx,%ecx,%edx,%eax)
-
-	BODY( 1*4,0xa4beea44,FN3,S31,%eax,%ebx,%ecx,%edx)
-	BODY( 4*4,0x4bdecfa9,FN3,S32,%edx,%eax,%ebx,%ecx)
-	BODY( 7*4,0xf6bb4b60,FN3,S33,%ecx,%edx,%eax,%ebx)
-	BODY(10*4,0xbebfbc70,FN3,S34,%ebx,%ecx,%edx,%eax)
-
-	BODY(13*4,0x289b7ec6,FN3,S31,%eax,%ebx,%ecx,%edx)
-	BODY( 0*4,0xeaa127fa,FN3,S32,%edx,%eax,%ebx,%ecx)
-	BODY( 3*4,0xd4ef3085,FN3,S33,%ecx,%edx,%eax,%ebx)
-	BODY( 6*4,0x04881d05,FN3,S34,%ebx,%ecx,%edx,%eax)
-
-	BODY( 9*4,0xd9d4d039,FN3,S31,%eax,%ebx,%ecx,%edx)
-	BODY(12*4,0xe6db99e5,FN3,S32,%edx,%eax,%ebx,%ecx)
-	BODY(15*4,0x1fa27cf8,FN3,S33,%ecx,%edx,%eax,%ebx)
-	BODY( 2*4,0xc4ac5665,FN3,S34,%ebx,%ecx,%edx,%eax)
-
-
-	BODY( 0*4,0xf4292244,FN4,S41,%eax,%ebx,%ecx,%edx)
-	BODY( 7*4,0x432aff97,FN4,S42,%edx,%eax,%ebx,%ecx)
-	BODY(14*4,0xab9423a7,FN4,S43,%ecx,%edx,%eax,%ebx)
-	BODY( 5*4,0xfc93a039,FN4,S44,%ebx,%ecx,%edx,%eax)
-
-	BODY(12*4,0x655b59c3,FN4,S41,%eax,%ebx,%ecx,%edx)
-	BODY( 3*4,0x8f0ccc92,FN4,S42,%edx,%eax,%ebx,%ecx)
-	BODY(10*4,0xffeff47d,FN4,S43,%ecx,%edx,%eax,%ebx)
-	BODY( 1*4,0x85845dd1,FN4,S44,%ebx,%ecx,%edx,%eax)
-
-	BODY( 8*4,0x6fa87e4f,FN4,S41,%eax,%ebx,%ecx,%edx)
-	BODY(15*4,0xfe2ce6e0,FN4,S42,%edx,%eax,%ebx,%ecx)
-	BODY( 6*4,0xa3014314,FN4,S43,%ecx,%edx,%eax,%ebx)
-	BODY(13*4,0x4e0811a1,FN4,S44,%ebx,%ecx,%edx,%eax)
-
-	BODY( 4*4,0xf7537e82,FN4,S41,%eax,%ebx,%ecx,%edx)
-	BODY(11*4,0xbd3af235,FN4,S42,%edx,%eax,%ebx,%ecx)
-	BODY( 2*4,0x2ad7d2bb,FN4,S43,%ecx,%edx,%eax,%ebx)
-	BODY( 9*4,0xeb86d391,FN4,S44,%ebx,%ecx,%edx,%eax)
-
-	addl $(16*4), %ebp
-	movl STATE(%esp), %edi
-	addl %eax,0(%edi)
-	addl %ebx,4(%edi)
-	addl %ecx,8(%edi)
-	addl %edx,12(%edi)
-
-	movl EDATA(%esp), %edi
-	cmpl %edi, %ebp
-	jb 0b
-
-	/* Postlude */
-	movl OLDEBX(%esp), %ebx
-	movl OLDESI(%esp), %esi
-	movl OLDEDI(%esp), %edi
-	addl $(STACKSIZE), %esp
-	popl %ebp
-	ret
-
diff --git a/src/libsec/386/mkfile b/src/libsec/386/mkfile
deleted file mode 100644
index 6f970600..00000000
--- a/src/libsec/386/mkfile
+++ /dev/null
@@ -1,26 +0,0 @@
-<$PLAN9/src/mkhdr
-
-LIB=libsec.a
-SFILES=\
-	md5block.s\
-	sha1block.s\
-
-HFILES=$PLAN9/include/libsec.h
-
-OFILES=${SFILES:%.s=%.$O}
-
-UPDATE=mkfile\
-	$HFILES\
-	$SFILES\
-
-<$PLAN9/src/mksyslib
-
-%.s: %.spp
-	if [ `uname` = OpenBSD ] || [ `uname` = Darwin ]
-	then
-		gcc -xc -D__`uname`__ -E $stem.spp >$stem.s
-	else
-		cpp $stem.spp >$stem.s
-	fi
-
-CLEANFILES=md5block.s sha1block.s
diff --git a/src/libsec/386/sha1block.spp b/src/libsec/386/sha1block.spp
deleted file mode 100644
index 386b2e6c..00000000
--- a/src/libsec/386/sha1block.spp
+++ /dev/null
@@ -1,221 +0,0 @@
-.text
-
-.p2align 2,0x90
-#ifdef __Darwin__
-.globl __sha1block
-__sha1block:
-#else
-.globl _sha1block
-_sha1block:
-#endif
-
-/* x = (wp[off-f] ^ wp[off-8] ^ wp[off-14] ^ wp[off-16]) <<< 1;
- * wp[off] = x;
- * x += A <<< 5;
- * E += 0xca62c1d6 + x;
- * x = FN(B,C,D);
- * E += x;
- * B >>> 2
- */
-#define BSWAPDI	BYTE $0x0f; BYTE $0xcf;
-
-#define BODY(off,FN,V,A,B,C,D,E)\
-	movl (off-64)(%ebp), %edi;\
-	xorl (off-56)(%ebp), %edi;\
-	xorl (off-32)(%ebp), %edi;\
-	xorl (off-12)(%ebp), %edi;\
-	roll $1, %edi;\
-	movl %edi, off(%ebp);\
-	leal V(%edi, E, 1), E;\
-	movl A, %edi;\
-	roll $5, %edi;\
-	addl %edi, E;\
-	FN(B,C,D)\
-	addl %edi, E;\
-	rorl $2, B;\
-
-#define BODY0(off,FN,V,A,B,C,D,E)\
-	movl off(%ebx), %edi;\
-	bswap %edi;\
-	movl %edi, off(%ebp);\
-	leal V(%edi,E,1), E;\
-	movl A, %edi;\
-	roll $5,%edi;\
-	addl %edi,E;\
-	FN(B,C,D)\
-	addl %edi,E;\
-	rorl $2,B;\
-
-/*
- * fn1 = (((C^D)&B)^D);
- */
-#define FN1(B,C,D)\
-	movl C, %edi;\
-	xorl D, %edi;\
-	andl B, %edi;\
-	xorl D, %edi;\
-
-/*
- * fn24 = B ^ C ^ D
- */
-#define FN24(B,C,D)\
-	movl B, %edi;\
-	xorl C, %edi;\
-	xorl D, %edi;\
-
-/*
- * fn3 = ((B ^ C) & (D ^= B)) ^ B
- * D ^= B to restore D
- */
-#define FN3(B,C,D)\
-	movl B, %edi;\
-	xorl C, %edi;\
-	xorl B, D;\
-	andl D, %edi;\
-	xorl B, %edi;\
-	xorl B, D;\
-
-/*
- * stack offsets
- * void sha1block(uchar *DATA, int LEN, ulong *STATE)
- */
-#define STACKSIZE (48+80*4)
-#define	DATA	(STACKSIZE+8)
-#define	LEN	(STACKSIZE+12)
-#define	STATE	(STACKSIZE+16)
-
-/*
- * stack offsets for locals
- * ulong w[80];
- * uchar *edata;
- * ulong *w15, *w40, *w60, *w80;
- * register local
- * ulong *wp = %ebp
- * ulong a = eax, b = ebx, c = ecx, d = edx, e = esi
- * ulong tmp = edi
- */
-#define WARRAY	(STACKSIZE-4-(80*4))
-#define TMP1	(STACKSIZE-8-(80*4))
-#define TMP2	(STACKSIZE-12-(80*4))
-#define W15	(STACKSIZE-16-(80*4))
-#define W40	(STACKSIZE-20-(80*4))
-#define W60	(STACKSIZE-24-(80*4))
-#define W80	(STACKSIZE-28-(80*4))
-#define EDATA	(STACKSIZE-32-(80*4))
-#define OLDEBX	(STACKSIZE-36-(80*4))
-#define OLDESI	(STACKSIZE-40-(80*4))
-#define OLDEDI	(STACKSIZE-44-(80*4))
-
-	/* Prelude */
-	pushl %ebp
-	subl $(STACKSIZE), %esp
-
-	mov %ebx, OLDEBX(%esp)
-	mov %esi, OLDESI(%esp)
-	mov %edi, OLDEDI(%esp)
-
-	movl DATA(%esp), %eax
-	addl LEN(%esp), %eax
-	movl %eax, EDATA(%esp)
-
-	leal (WARRAY+15*4)(%esp), %edi	/* aw15 */
-	movl %edi, W15(%esp)
-	leal (WARRAY+40*4)(%esp), %edx	/* aw40 */
-	movl %edx, W40(%esp)
-	leal (WARRAY+60*4)(%esp), %ecx	/* aw60 */
-	movl %ecx, W60(%esp)
-	leal (WARRAY+80*4)(%esp), %edi	/* aw80 */
-	movl %edi, W80(%esp)
-
-0:
-	leal WARRAY(%esp), %ebp		/* warray */
-
-	movl STATE(%esp), %edi		/* state */
-	movl (%edi),%eax
-	movl 4(%edi),%ebx
-	movl %ebx, TMP1(%esp)		/* tmp1 */
-	movl 8(%edi), %ecx
-	movl 12(%edi), %edx
-	movl 16(%edi), %esi
-
-	movl DATA(%esp), %ebx		/* data */
-
-1:
-	BODY0(0,FN1,0x5a827999,%eax,TMP1(%esp),%ecx,%edx,%esi)
-	movl %esi,TMP2(%esp)
-	BODY0(4,FN1,0x5a827999,%esi,%eax,TMP1(%esp),%ecx,%edx)
-	movl TMP1(%esp),%esi
-	BODY0(8,FN1,0x5a827999,%edx,TMP2(%esp),%eax,%esi,%ecx)
-	BODY0(12,FN1,0x5a827999,%ecx,%edx,TMP2(%esp),%eax,%esi)
-	movl %esi,TMP1(%esp)
-	BODY0(16,FN1,0x5a827999,%esi,%ecx,%edx,TMP2(%esp),%eax)
-	movl TMP2(%esp),%esi
-
-	addl $20, %ebx
-	addl $20, %ebp
-	cmpl W15(%esp), %ebp	/* w15 */
-	jb 1b
-
-	BODY0(0,FN1,0x5a827999,%eax,TMP1(%esp),%ecx,%edx,%esi)
-	addl $4, %ebx
-	movl %ebx, DATA(%esp)	/* data */
-	movl TMP1(%esp),%ebx
-
-	BODY(4,FN1,0x5a827999,%esi,%eax,%ebx,%ecx,%edx)
-	BODY(8,FN1,0x5a827999,%edx,%esi,%eax,%ebx,%ecx)
-	BODY(12,FN1,0x5a827999,%ecx,%edx,%esi,%eax,%ebx)
-	BODY(16,FN1,0x5a827999,%ebx,%ecx,%edx,%esi,%eax)
-
-	addl $20, %ebp
-
-2:
-	BODY(0,FN24,0x6ed9eba1,%eax,%ebx,%ecx,%edx,%esi)
-	BODY(4,FN24,0x6ed9eba1,%esi,%eax,%ebx,%ecx,%edx)
-	BODY(8,FN24,0x6ed9eba1,%edx,%esi,%eax,%ebx,%ecx)
-	BODY(12,FN24,0x6ed9eba1,%ecx,%edx,%esi,%eax,%ebx)
-	BODY(16,FN24,0x6ed9eba1,%ebx,%ecx,%edx,%esi,%eax)
-
-	addl $20,%ebp
-	cmpl W40(%esp), %ebp
-	jb 2b
-
-3:
-	BODY(0,FN3,0x8f1bbcdc,%eax,%ebx,%ecx,%edx,%esi)
-	BODY(4,FN3,0x8f1bbcdc,%esi,%eax,%ebx,%ecx,%edx)
-	BODY(8,FN3,0x8f1bbcdc,%edx,%esi,%eax,%ebx,%ecx)
-	BODY(12,FN3,0x8f1bbcdc,%ecx,%edx,%esi,%eax,%ebx)
-	BODY(16,FN3,0x8f1bbcdc,%ebx,%ecx,%edx,%esi,%eax)
-
-	addl $20, %ebp
-	cmpl W60(%esp), %ebp 	/* w60 */
-	jb 3b
-
-4:
-	BODY(0,FN24,0xca62c1d6,%eax,%ebx,%ecx,%edx,%esi)
-	BODY(4,FN24,0xca62c1d6,%esi,%eax,%ebx,%ecx,%edx)
-	BODY(8,FN24,0xca62c1d6,%edx,%esi,%eax,%ebx,%ecx)
-	BODY(12,FN24,0xca62c1d6,%ecx,%edx,%esi,%eax,%ebx)
-	BODY(16,FN24,0xca62c1d6,%ebx,%ecx,%edx,%esi,%eax)
-
-	addl $20, %ebp
-	cmpl W80(%esp), %ebp 	/* w80 */
-	jb 4b
-
-	movl STATE(%esp), %edi	/* state */
-	addl %eax, 0(%edi)
-	addl %ebx, 4(%edi)
-	addl %ecx, 8(%edi)
-	addl %edx, 12(%edi)
-	addl %esi, 16(%edi)
-
-	movl EDATA(%esp), %edi	/* edata */
-	cmpl %edi, DATA(%esp)	/* data */
-	jb 0b
-
-	/* Postlude */
-	mov OLDEBX(%esp), %ebx
-	mov OLDESI(%esp), %esi
-	mov OLDEDI(%esp), %edi
-	addl $(STACKSIZE), %esp
-	popl %ebp
-	ret
diff --git a/src/libsec/PowerMacintosh/mkfile b/src/libsec/PowerMacintosh/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/PowerMacintosh/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/arm/mkfile b/src/libsec/arm/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/arm/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/arm64/mkfile b/src/libsec/arm64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/arm64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/mips/mkfile b/src/libsec/mips/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/mips/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/mkfile b/src/libsec/mkfile
index e3f1aa69..81f237c4 100644
--- a/src/libsec/mkfile
+++ b/src/libsec/mkfile
@@ -2,6 +2,6 @@
 
 DIRS=\
 	port\
-	$OBJTYPE\
+#	$OBJTYPE\
 
 <$PLAN9/src/mkdirs
diff --git a/src/libsec/port/mkfile b/src/libsec/port/mkfile
index 60baf2a3..7db34a97 100644
--- a/src/libsec/port/mkfile
+++ b/src/libsec/port/mkfile
@@ -54,7 +54,8 @@ ALLOFILES=\
 	tlshand.$O\
 	x509.$O\
 
-OFILES=`{sh ./reduce $O $OBJTYPE $ALLOFILES}
+# OFILES=`{sh ./reduce $O $OBJTYPE $ALLOFILES}
+OFILES=$ALLOFILES
 HFILES=$PLAN9/include/libsec.h
 
 <$PLAN9/src/mksyslib
diff --git a/src/libsec/power/mkfile b/src/libsec/power/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/power/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/sparc64/mkfile b/src/libsec/sparc64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/sparc64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/sun4u/mkfile b/src/libsec/sun4u/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/sun4u/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/libsec/x86_64/mkfile b/src/libsec/x86_64/mkfile
deleted file mode 100644
index 43a4662b..00000000
--- a/src/libsec/x86_64/mkfile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-
-%:V:
-	# nothing to see here
diff --git a/src/mkfile b/src/mkfile
index 4740780d..d17ca6b6 100644
--- a/src/mkfile
+++ b/src/mkfile
@@ -37,9 +37,7 @@ mkmk.sh:VD:
 	) | sed '
 		s/'$INSTALL'/$INSTALL/g
 		s/'$SYSNAME'/$SYSNAME/g
-		s/'$OBJTYPE'/$OBJTYPE/g
 		s;'$PLAN9';$PLAN9;g
-		s/^9[ac] *tas-.*/9a tas-$OBJTYPE.s || 9c tas-$OBJTYPE.c/
 	' >$target
 
 testmkmk:V:
diff --git a/unix/make/Make.Darwin b/unix/make/Make.Darwin
new file mode 100644
index 00000000..21ede6f2
--- /dev/null
+++ b/unix/make/Make.Darwin
@@ -0,0 +1,7 @@
+CC=gcc
+CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include
+O=o
+AR=ar
+ARFLAGS=rvc
+NAN=nan64.$O
+RANLIB=ranlib
-- 
cgit v1.2.3


From ebbeff0ac69f8fa25fed3f85d2e7b2261e4fa2aa Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 07:59:26 -0500
Subject: .gitignore: enumerate ignored parts of bin/

---
 .gitignore | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 218 insertions(+), 17 deletions(-)

(limited to '*[pngfile]')

diff --git a/.gitignore b/.gitignore
index f590cf28..61deffc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,226 @@
-plan9.log
-plan9-reverse.log
-state
-state.old
-state.journal
-*.o
 *.a
-man/man?/*.html
-src/**/o.*
-y.tab.[ch]
-src/cmd/rc/x.tab.h
-unix/*.tgz
-bin/
-log/
-dict/
-postscript/font/
-sky/here
-sky/*.scat
+*.o
 *.orig
+bin/9660srv
+bin/9import
+bin/9p
+bin/9pfuse
+bin/9pserve
+bin/9term
+bin/Mail
+bin/Netfiles
+bin/acid
+bin/acidtypes
+bin/acme
+bin/acmeevent
+bin/aescbc
+bin/ascii
+bin/asn12dsa
+bin/asn12rsa
+bin/astro
+bin/auxclog
+bin/auxstats
+bin/awk
+bin/basename
+bin/bc
+bin/bmp
+bin/bunzip2
+bin/bzip2
+bin/cal
+bin/calendar
+bin/cat
+bin/cb
+bin/cleanname
+bin/clock
+bin/cmapcube
+bin/cmp
+bin/col
+bin/colors
+bin/comm
+bin/compress
+bin/core
+bin/crop
+bin/date
+bin/db
+bin/dc
+bin/dd
+bin/delatex
+bin/deroff
+bin/devdraw
+bin/dial
+bin/dict
+bin/diff
+bin/disknfs
+bin/dns
+bin/dnsdebug
+bin/dnsquery
+bin/dnstcp
+bin/dsa2pub
+bin/dsa2ssh
+bin/dsagen
+bin/dsasign
+bin/du
+bin/dump9660
+bin/echo
+bin/ed
+bin/eqn
+bin/factor
+bin/factotum
+bin/file
+bin/fmt
+bin/fontsrv
+bin/fortune
+bin/freq
+bin/fsize
+bin/getflags
+bin/gif
+bin/grap
+bin/graph
+bin/grep
+bin/gunzip
+bin/gview
+bin/gzip
+bin/hget
+bin/hist
+bin/hoc
+bin/htmlfmt
+bin/htmlroff
+bin/ico
+bin/iconv
+bin/idiff
+bin/img
+bin/import
+bin/join
+bin/jpg
+bin/lex
+bin/listen1
+bin/look
+bin/ls
+bin/macargv
+bin/mapd
+bin/mc
+bin/md5sum
+bin/mk
+bin/mkdir
+bin/mklatinkbd
+bin/mtime
+bin/namespace
+bin/ndbipquery
+bin/ndbmkdb
+bin/ndbmkhash
+bin/ndbmkhosts
+bin/ndbquery
+bin/netkey
+bin/news
+bin/p
+bin/page
+bin/paint
+bin/passwd
+bin/pbd
+bin/pemdecode
+bin/pemencode
+bin/pic
+bin/plot
+bin/plumb
+bin/plumber
+bin/png
+bin/ppm
+bin/pr
+bin/primes
+bin/proof
+bin/psdownload
+bin/ramfs
+bin/rc
+bin/read
+bin/readcons
+bin/resample
+bin/rm
+bin/rsa2csr
+bin/rsa2pub
+bin/rsa2ssh
+bin/rsa2x509
+bin/rsafill
+bin/rsagen
+bin/sam
+bin/samterm
+bin/scat
+bin/secstore
+bin/secstored
+bin/secuser
+bin/sed
+bin/seq
+bin/sftpcache
+bin/sha1sum
+bin/sleep
+bin/sort
+bin/split
+bin/sprog
+bin/srv
+bin/ssh-agent
+bin/stats
+bin/statusbar
+bin/strings
+bin/sum
+bin/svgpic
+bin/tail
+bin/tar
+bin/tbl
+bin/tcolors
+bin/tcs
+bin/tee
+bin/test
+bin/time
+bin/togif
+bin/toico
+bin/topng
+bin/toppm
+bin/touch
+bin/tpic
+bin/tr
+bin/tr2post
+bin/troff
+bin/troff2html
+bin/tweak
+bin/uncompress
+bin/unicode
+bin/uniq
+bin/units
+bin/unutf
+bin/unvac
+bin/unzip
+bin/usage
+bin/vac
+bin/vacfs
+bin/vbackup
+bin/vcat
+bin/vmount0
+bin/vnfs
+bin/wc
+bin/win
+bin/xd
+bin/yacc
+bin/yuv
+bin/zcat
+bin/zerotrunc
+bin/zip
 config
+dict/
 install.log
 install.sum
 last-change
+log/
+man/man?/*.html
+plan9-reverse.log
+plan9.log
+postscript/font/
+sky/*.scat
+sky/here
+src/**/o.*
 src/cmd/awk/y.output
 src/cmd/devdraw/latin1.h
+src/cmd/rc/x.tab.h
+state
+state.journal
+state.old
+unix/*.tgz
+y.tab.[ch]
-- 
cgit v1.2.3


From ee9b2a22996e29d55b97f7717163989173c71747 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 08:44:15 -0500
Subject: .gitignore: more binaries

---
 .gitignore | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to '*[pngfile]')

diff --git a/.gitignore b/.gitignore
index 61deffc6..bb7c160d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.a
 *.o
 *.orig
+bin/"
+bin/""
 bin/9660srv
 bin/9import
 bin/9p
@@ -50,6 +52,8 @@ bin/devdraw
 bin/dial
 bin/dict
 bin/diff
+bin/disk/mkext
+bin/disk/mkfs
 bin/disknfs
 bin/dns
 bin/dnsdebug
@@ -70,7 +74,21 @@ bin/file
 bin/fmt
 bin/fontsrv
 bin/fortune
+bin/fossil/conf
+bin/fossil/flchk
+bin/fossil/flfmt
+bin/fossil/fossil
+bin/fossil/last
+bin/fossil/view
 bin/freq
+bin/fs/32vfs
+bin/fs/cpiofs
+bin/fs/tapfs
+bin/fs/tarfs
+bin/fs/tpfs
+bin/fs/v10fs
+bin/fs/v6fs
+bin/fs/zipfs
 bin/fsize
 bin/getflags
 bin/gif
@@ -101,6 +119,7 @@ bin/mapd
 bin/mc
 bin/md5sum
 bin/mk
+bin/mk9660
 bin/mkdir
 bin/mklatinkbd
 bin/mtime
@@ -110,6 +129,10 @@ bin/ndbmkdb
 bin/ndbmkhash
 bin/ndbmkhosts
 bin/ndbquery
+bin/netfileget
+bin/netfilelib.rc
+bin/netfileput
+bin/netfilestat
 bin/netkey
 bin/news
 bin/p
@@ -193,6 +216,31 @@ bin/vac
 bin/vacfs
 bin/vbackup
 bin/vcat
+bin/venti/buildindex
+bin/venti/checkarenas
+bin/venti/checkindex
+bin/venti/clumpstats
+bin/venti/conf
+bin/venti/copy
+bin/venti/dump
+bin/venti/findscore
+bin/venti/fixarenas
+bin/venti/fmtarenas
+bin/venti/fmtbloom
+bin/venti/fmtindex
+bin/venti/fmtisect
+bin/venti/mirrorarenas
+bin/venti/printarena
+bin/venti/printarenapart
+bin/venti/rdarena
+bin/venti/read
+bin/venti/ro
+bin/venti/sync
+bin/venti/syncindex
+bin/venti/venti
+bin/venti/verifyarena
+bin/venti/wrarena
+bin/venti/write
 bin/vmount0
 bin/vnfs
 bin/wc
-- 
cgit v1.2.3


From f23783cbb197f71f867bd9d44abfa8787a65448b Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 08:46:47 -0500
Subject: .gitignore: add LOCAL.config and lib/fortunes.index

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '*[pngfile]')

diff --git a/.gitignore b/.gitignore
index bb7c160d..ad8a20de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.a
 *.o
 *.orig
+LOCAL.config
 bin/"
 bin/""
 bin/9660srv
@@ -256,6 +257,7 @@ dict/
 install.log
 install.sum
 last-change
+lib/fortunes.index
 log/
 man/man?/*.html
 plan9-reverse.log
-- 
cgit v1.2.3


From 36cd4c58c1346375b98f517fb8568be5bb47618d Mon Sep 17 00:00:00 2001
From: Fazlul Shahriar <fshahriar@gmail.com>
Date: Fri, 29 Jan 2021 18:55:29 -0500
Subject: man9: rename IM to MR

Commit d32deab17bfffa5bffc5fab3e6577558e40888c5 renamed IM to MR but
these man pages were missed.
---
 man/man9/0intro.9p  | 18 +++++++++---------
 man/man9/attach.9p  |  4 ++--
 man/man9/clunk.9p   |  2 +-
 man/man9/flush.9p   |  4 ++--
 man/man9/open.9p    |  4 ++--
 man/man9/openfd.9p  |  8 ++++----
 man/man9/read.9p    |  2 +-
 man/man9/remove.9p  |  2 +-
 man/man9/stat.9p    |  4 ++--
 man/man9/version.9p |  2 +-
 man/man9/walk.9p    |  4 ++--
 11 files changed, 27 insertions(+), 27 deletions(-)

(limited to '*[pngfile]')

diff --git a/man/man9/0intro.9p b/man/man9/0intro.9p
index f432cf51..30e153a1 100644
--- a/man/man9/0intro.9p
+++ b/man/man9/0intro.9p
@@ -21,7 +21,7 @@ such a machine is called, somewhat confusingly, a
 Another possibility for a server is to synthesize
 files on demand, perhaps based on information on data structures
 maintained in memory; the
-.IM plumber (4)
+.MR plumber (4)
 server is an example of such a server.
 .PP
 A
@@ -63,7 +63,7 @@ bytes of data.
 Text strings are represented this way,
 with the text itself stored as a UTF-8
 encoded sequence of Unicode characters (see
-.IM utf (7) ).
+.MR utf (7) ).
 Text strings in 9P messages are not
 .SM NUL\c
 -terminated:
@@ -114,7 +114,7 @@ Plan 9 names may contain any printable character (that is, any character
 outside hexadecimal 00-1F and 80-9F)
 except slash.)
 Messages are transported in byte form to allow for machine independence;
-.IM fcall (3)
+.MR fcall (3)
 describes routines that convert to and from this form into a machine-dependent
 C structure.
 .SH MESSAGES
@@ -348,7 +348,7 @@ a ``current file'' on the server.
 Fids are somewhat like file descriptors in a user process,
 but they are not restricted to files open for I/O:
 directories being examined, files being accessed by
-.IM stat (3)
+.MR stat (3)
 calls, and so on \(em all files being manipulated by the operating
 system \(em are identified by fids.
 Fids are chosen by the client.
@@ -461,7 +461,7 @@ to have their input or output attached to fids on 9P servers.
 See
 .IR openfd (9p)
 and
-.IM 9pclient (3)
+.MR 9pclient (3)
 for details.
 .PP
 The
@@ -475,7 +475,7 @@ access permissions (read, write and execute for owner, group and public),
 access and modification times, and
 owner and group identifications
 (see
-.IM stat (3) ).
+.MR stat (3) ).
 The owner and group identifications are textual names.
 The
 .B wstat
@@ -523,12 +523,12 @@ into 9P messages.
 .SS Unix
 On Unix, 9P services are posted as Unix domain sockets in a
 well-known directory (see
-.IM getns (3)
+.MR getns (3)
 and
-.IM 9pserve (4) ).
+.MR 9pserve (4) ).
 Clients connect to these servers using a 9P client library
 (see
-.IM 9pclient (3) ).
+.MR 9pclient (3) ).
 .SH DIRECTORIES
 Directories are created by
 .B create
diff --git a/man/man9/attach.9p b/man/man9/attach.9p
index 3a5104d5..4160f30d 100644
--- a/man/man9/attach.9p
+++ b/man/man9/attach.9p
@@ -122,7 +122,7 @@ and
 and
 .I fsauth
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generate
 .B attach
 and
@@ -163,6 +163,6 @@ transactions.
 .\" .B mount
 .\" system call on an uninitialized connection.
 .SH SEE ALSO
-.IM 9pclient (3) ,
+.MR 9pclient (3) ,
 .IR version (9P),
 Plan 9's \fIauthsrv\fR(6)
diff --git a/man/man9/clunk.9p b/man/man9/clunk.9p
index 3277c4b0..f014ac42 100644
--- a/man/man9/clunk.9p
+++ b/man/man9/clunk.9p
@@ -41,7 +41,7 @@ generated by
 and
 .I fsunmount
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 and indirectly by other actions such as failed
 .I fsopen
 calls.
diff --git a/man/man9/flush.9p b/man/man9/flush.9p
index d0987cac..862ab9a4 100644
--- a/man/man9/flush.9p
+++ b/man/man9/flush.9p
@@ -99,11 +99,11 @@ flushing a
 and flushing an invalid tag.
 .SH ENTRY POINTS
 The
-.IM 9pclient (3)
+.MR 9pclient (3)
 library does not generate
 .B flush
 transactions..
-.IM 9pserve (4)
+.MR 9pserve (4)
 generates
 .B flush
 transactions to cancel transactions pending when a client hangs up.
diff --git a/man/man9/open.9p b/man/man9/open.9p
index 1f74eb07..8a54f72c 100644
--- a/man/man9/open.9p
+++ b/man/man9/open.9p
@@ -160,7 +160,7 @@ in this case, the
 .I fscreate
 call
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 uses
 .B open
 with truncation.
@@ -209,7 +209,7 @@ again.
 and
 .I fscreate
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 both generate
 .B open
 messages; only
diff --git a/man/man9/openfd.9p b/man/man9/openfd.9p
index 56fb392a..620b1991 100644
--- a/man/man9/openfd.9p
+++ b/man/man9/openfd.9p
@@ -43,18 +43,18 @@ it cannot be
 .PP
 .I Openfd
 is implemented by
-.IM 9pserve (4) .
+.MR 9pserve (4) .
 9P servers that post their services using
-.IM 9pserve (4)
+.MR 9pserve (4)
 (or indirectly via
-.IM post9pservice (3) )
+.MR post9pservice (3) )
 will never see a
 .B Topenfd
 message.
 .SH ENTRY POINTS
 .I Fsopenfd
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generates an
 .B openfd
 message.
diff --git a/man/man9/read.9p b/man/man9/read.9p
index 515f85c3..675bb773 100644
--- a/man/man9/read.9p
+++ b/man/man9/read.9p
@@ -114,7 +114,7 @@ to be transferred atomically.
 and
 .I fswrite
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generate the corresponding messages.
 Because they take an offset parameter, the
 .I fspread
diff --git a/man/man9/remove.9p b/man/man9/remove.9p
index 79a646a1..232c88f6 100644
--- a/man/man9/remove.9p
+++ b/man/man9/remove.9p
@@ -45,7 +45,7 @@ so other fids typically remain usable.
 .SH ENTRY POINTS
 .I Fsremove
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generates
 .B remove
 messages.
diff --git a/man/man9/stat.9p b/man/man9/stat.9p
index b92f2d69..7706d3eb 100644
--- a/man/man9/stat.9p
+++ b/man/man9/stat.9p
@@ -88,7 +88,7 @@ The
 and
 .I convD2M
 routines (see
-.IM fcall (3) )
+.MR fcall (3) )
 convert between directory entries and a C structure called a
 .BR Dir .
 .PP
@@ -263,7 +263,7 @@ messages are generated by
 and
 .IR fsdirstat
 (see
-.IM 9pclient (3) ).
+.MR 9pclient (3) ).
 .PP
 .B Wstat
 messages are generated by
diff --git a/man/man9/version.9p b/man/man9/version.9p
index 99f30239..c71ee556 100644
--- a/man/man9/version.9p
+++ b/man/man9/version.9p
@@ -91,7 +91,7 @@ requests is called a
 .SH ENTRY POINTS
 .I Fsversion
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generates
 .B version
 messages;
diff --git a/man/man9/walk.9p b/man/man9/walk.9p
index b48b947b..735b7dcb 100644
--- a/man/man9/walk.9p
+++ b/man/man9/walk.9p
@@ -149,13 +149,13 @@ may be packed in a single message.
 This constant is called
 .B MAXWELEM
 in
-.IM fcall (3) .
+.MR fcall (3) .
 Despite this restriction, the system imposes no limit on the number of elements in a file name,
 only the number that may be transmitted in a single message.
 .SH ENTRY POINTS
 .I Fswalk
 (see
-.IM 9pclient (3) )
+.MR 9pclient (3) )
 generates walk messages.
 One or more walk messages may be generated by
 any call that evaluates file names:
-- 
cgit v1.2.3